Sync'd branch integration/fx-team with upstream @ Fri Nov  7 10:56:08 PST 2014