Sync'd branch integration/fx-team with upstream @ Fri Oct  3 10:31:43 PDT 2014