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