Sync'd branch integration/fx-team with upstream @ Fri Oct  3 07:27:44 PDT 2014