2014-07-18 00:12:42 -0400
Merge branch 'master' into gh-pages