Params using weak_ptr to Window to prevent cycle
Fixing bug preventing Window UserData from being deleted
Merge remote-tracking branch 'upstream/dev' into dev-scons