Merge branch 'master' into configuring_puma
Merging master