Sync'd branch integration/fx-team with upstream @ Wed Oct 22 21:05:12 PDT 2014