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