Sync'd branch integration/fx-team with upstream @ Tue Sep  2 11:43:37 PDT 2014