A 58-year-old man presents with polydipsia, polyuria and weight loss over 3 months. Random capillary glucose in the clinic is 18.0 mmol/L. Fasting plasma glucose on two separate mornings is 8.2 and 8.5 mmol/L. HbA1c is 7.6%. According to Australian guidelines, what is the most appropriate diagnosis?