Sync'd branch integration/fx-team with upstream @ Fri Sep  5 09:43:40 PDT 2014