Merge branch 'install-improvements' into noblehour
Merge branch 'hasjs' into noblehour