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