Sync'd branch integration/fx-team with upstream @ Tue Nov  4 05:21:36 PST 2014