Sync'd branch integration/fx-team with upstream @ Fri Sep  5 03:20:36 PDT 2014