Sync'd branch integration/fx-team with upstream @ Fri Sep  5 13:53:39 PDT 2014