Merge branch 'refs/heads/feature/magento-64' into unlooped

Conflicts:
	app/code/local/Loomagic/Manufacturer/Model/Manufacturer/Source/Option.php