Merge remote-tracking branch 'randomjunk/minor-updates'