Fixed WAS_HOME
Note that this should actually be a classpath variable (or something
equivalent).
Merge remote-tracking branch 'origin/master'