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