Sync'd branch integration/fx-team with upstream @ Wed Oct  1 03:49:42 PDT 2014