Code cleanup.
Fix TestSynchronizationContext initialization (being put in evidence through triangulated tests).
Merge remote-tracking branch 'origin/master'