Conflicts:
	.git-mysql/commit.py
	.git-mysql/default.conf
	CMakeLists.txt
	MySQLWorkbench.sln
	MySQLWorkbench.xcodeproj/project.pbxproj
	backend/wbprivate/sqlide/wb_sql_editor_form.cpp
	build/debian.in/changelog
	library/forms/utilities.cpp
	library/grt/src/diff/grtdiff.cpp
	modules/db.mysql/src/db_mysql_diffsqlgen.cpp
	modules/db.mysql/src/module_db_mysql.cpp
	modules/wb.fabric.interface/wb.fabric.interface.grt.vcxproj
	modules/wb.fabric.interface/wb.fabric.interface.grt.vcxproj.filters
	modules/wb.fabric.interface/wb_fabric_interface.cpp
	modules/wb.fabric.interface/wb_fabric_interface.h
	plugins/wb.admin/internal/wba_meb/wb_admin_meb_common.py
	prefix/wb.fabric.interface.grt_prefix.pch
	res/scripts/python/mysqlwbmeb.py
	res/scripts/vbs/mysqlwbmeb.vbs

All conflicts solved.