Merge branch 'develop'
Fix duplicate engine option in Magent EE
Merge branch 'hotfix/ee-duplicate-engine-option'
Merge branch 'hotfix/ee-duplicate-engine-option' into develop
Merge branch 'develop' of git://github.com/ctasca/magento-elasticsearch-module into develop
Merge branch 'master' into develop