Sync'd branch integration/fx-team with upstream @ Tue Nov 11 17:35:03 PST 2014