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