Reverse the last hack and really (try to) solve it
Merge branch 'master' into gh-pages