Sync'd branch integration/fx-team with upstream @ Tue Nov  4 16:56:42 PST 2014