Sync'd branch integration/fx-team with upstream @ Mon Nov  3 23:51:43 PST 2014