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