Sync'd branch integration/fx-team with upstream @ Tue Sep  2 14:57:35 PDT 2014