Update 31-jul-2013
Merge branch 'master' into gh-pages