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