Sync'd branch integration/fx-team with upstream @ Mon Nov 10 11:11:58 PST 2014