Sync'd branch integration/fx-team with upstream @ Tue Sep  2 15:55:29 PDT 2014