Fixed merge error
Merge branch 'develop' of github.com:basdenooijer/solarium into develop