Merge branch 'master' into int32
Merge branch 'int32' of github.com:gawrysz/piernik into int32