00 & 01: 2014 update
Merge branch 'master' into gh-pages