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