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