Sync'd branch integration/fx-team with upstream @ Tue Sep  9 15:57:21 PDT 2014