Merge branch '1.4' into 1

Author: dhensby

code/GoogleMapField.php

@@ -149,7 +149,7 @@ public function Field($properties = array()) {
 			),
 		);
 
-		$jsOptions = array_replace_recursive($this->options, $jsOptions);
+		$jsOptions = array_replace_recursive($jsOptions, $this->options);
 		$this->setAttribute('data-settings', Convert::array2json($jsOptions));
 		$this->requireDependencies();
 		return parent::Field($properties);