Merge branch 'master' into elastic-align