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