Re-applied the patch required for mapping_options from Sydney-o9's fork and fixes issue #343
Merge branch 'master' of github.com:frak/FOSElasticaBundle