Merge remote-tracking branch 'slipson/master', bullet
Merge remote-tracking branch 'aschin/master'
try to get Adam's latest changes