2013-10-11: Hart and Brunner
Merge remote-tracking branch 'origin/master' into gh-pages