Sync'd branch integration/fx-team with upstream @ Tue Nov 11 14:18:09 PST 2014