Sync'd branch integration/fx-team with upstream @ Tue Sep  9 03:59:36 PDT 2014