cross thread fixes
Merge remote-tracking branch 'origin/VS2012'