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