Sync'd branch integration/fx-team with upstream @ Mon Nov 10 05:39:01 PST 2014