Archive up to July 2 2013
Merge branch 'master' into gh-pages
Archive up to July 2 2013