Do not change views on current WP change
Merge pull request #532 from thomasgubler/map3d_errors

fix unused-but-set-variable warnings/errors in map3D
Merge remote-tracking branch 'upstream/master' into archlinux_dev3