Merge branch 'master' into debian-32
Fixed #17: Tomcat needs to use 32bit Java
Merge remote-tracking branch 'github/debian-32' into debian-32