Sync'd branch integration/fx-team with upstream @ Fri Sep  5 17:15:31 PDT 2014