merge production into master

Any objections?