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