Fix zip packaging
Fix warnings for Linux
Merge remote-tracking branch 'origin/master'
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e1c9ad174d46ded6219c09a8f457b9d4ecdf50be, reversing
changes made to 960a9b374ee9947bd3f4c472286538258330a31c.
Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 7e35304541089c1662aefd4a265c0ea07894bc91.
Merge branch 'master' into ws1415_1
Fix warning on Linux