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