Merge back from develop

lol, Windows 8