Merged chris/issue-314 into master
Merged chris/issue-384 into master
Merge branch 'morandini/fix-issue-352'
Merge branch 'garth/fix-issue-438-replace-elasticity-demo'
Merge branch 'master' into next