Sync'd branch integration/fx-team with upstream @ Fri Oct  3 11:09:41 PDT 2014