Sync'd branch integration/fx-team with upstream @ Tue Nov 11 13:31:06 PST 2014