Merge remote-tracking branch 'origin/master' into packer/map-fixes
authorpacker <packer@none>
Tue, 18 Aug 2015 23:03:31 +0000 (01:03 +0200)
committerpacker <packer@none>
Tue, 18 Aug 2015 23:03:31 +0000 (01:03 +0200)

Trivial merge