Merge branch 'master' into flex_viewer_refactor

Conflicts:
	org.eclipse.ui.externaltools/buildfiles/exportplugin.xml