Sync'd branch integration/fx-team with upstream @ Wed Oct 22 13:07:42 PDT 2014