Sync'd branch integration/fx-team with upstream @ Fri Nov  7 17:59:42 PST 2014