Use $HOME rather than the /data directory.
Merge remote-tracking branch 'origin/master' into gh-pages