Merge remote-tracking branch 'gravitystorm/choices'