Sync'd branch integration/fx-team with upstream @ Wed Nov 12 01:20:59 PST 2014