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