Merge branch 'elasticsearch-1.3.x
Merge branch 'master' of github.com:Graylog2/graylog2-server