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