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