Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js

ext/gd/gd.c

@@ -5304,6 +5304,7 @@ PHP_FUNCTION(imageaffinematrixget)
 			double x, y;
 			if (Z_TYPE_P(options) != IS_ARRAY) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array expected as options");
+				RETURN_FALSE;
 			}
 			if (zend_hash_find(HASH_OF(options), "x", sizeof("x"), (void **)&tmp) != FAILURE) {
 				if (Z_TYPE_PP(tmp) != IS_DOUBLE) {