Sync'd branch integration/fx-team with upstream @ Thu Nov 13 01:21:54 PST 2014