Sync'd branch integration/fx-team with upstream @ Wed Oct  8 20:45:48 PDT 2014