Kenny 11/18/14 23:00
Merge remote-tracking branch 'origin/master' into kenny