Merge branch 'master' into kyle
Fixed problems with new installation messages.
Merge branch 'kyle'