Enable advanced tab for image links in TinyMCE by default
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/tinymce4/config/zenpage-basic.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-classic.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-full.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-light.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-slim.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-basic.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-classic.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-full.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-light.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-slim.js.php

	modified:   zp-core/zp-extensions/tinymce/config/config.js.php
1f86470a8e4a5fcae0d6ae91ab6521dea269ba5e