Sync'd branch integration/fx-team with upstream @ Tue Nov 11 18:52:59 PST 2014