Form bug fixes.
Merge remote-tracking branch 'origin/master' into dev. Bring dev up to date with production bug fixes.