presented Sept 20, 2013
Merge remote-tracking branch 'github/master'