Merge remote-tracking branch 'chase/bugfix'
Merge remote-tracking branch 'origin/master'
Pre-release bugs