Sync'd branch integration/fx-team with upstream @ Wed Nov 12 02:06:03 PST 2014