Merge branch 'master' into 'production'
assigned to @pcain
added 2 commits
Compare with previous version
merged
mentioned in commit 0e612526