Sync'd branch integration/fx-team with upstream @ Fri Sep  5 00:45:37 PDT 2014