06: 2013 update
Merge branch 'master' into gh-pages