Merge branch 'master' into develop

public/src/admin/settings/general.js

@@ -18,7 +18,7 @@ define('admin/settings/general', ['admin/settings'], function () {
 			$('input[data-field="brand:maskableIcon"]').val('');
 		});
 		$('button[data-action="removeOgImage"]').on('click', function () {
-			$('input[data-field="removeOgImage"]').val('');
+			$('input[data-field="og:image"]').val('');
 		});
 
 		$('[data-field="homePageRoute"]').on('change', toggleCustomRoute);

public/src/modules/api.js

@@ -69,18 +69,23 @@ async function xhr(options, cb) {
 	const isJSON = contentType && contentType.startsWith('application/json');
 
 	let response;
+	if (options.method !== 'head') {
 		if (isJSON) {
 			response = await res.json();
 		} else {
 			response = await res.text();
 		}
+	}
 
 	if (!res.ok) {
+		if (response) {
 			return cb(new Error(isJSON ? response.status.message : response));
 		}
+		return cb(new Error(res.statusText));
+	}
 
 	cb(null, (
-		isJSON && response.hasOwnProperty('status') && response.hasOwnProperty('response') ?
+		isJSON && response && response.hasOwnProperty('status') && response.hasOwnProperty('response') ?
 			response.response :
 			response
 	));