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