Someone forgot to compact the wolf remote
War on ugly icon in inventory
Fixed windows build with the latest cmake
This should fix OSX blah blah
Merge remote-tracking branch 'upstream/release'
Merge commit 'e9330f8a8752d6b6effce438204cd0d2e69a1d0f'
Merge remote-tracking branch 'melanie_t/master'