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