Merged in minor local changes
Merge branch 'master' of https://github.com/ElectricityAuthority/asx.git