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