Merge commit 'eae3ab31ce347b0b058daaa327c1d3a8f0633685' into sdl-host
Merge commit 'd750a10985cf0dd6aa799266209ad2b40e5999aa' into sdl-host
Merge commit 'ca9289b5ef357b8d0282032c900f55c5fbd2c7b9' into sdl-host
Merge commit '393474c3e0247674f42fd05f1e274f4fd60752b3' into sdl-host
Fixes to make Mac OS X compile (for the moment. need to re-enable folder watching sometime)