Sync'd branch integration/fx-team with upstream @ Tue Sep 23 09:54:36 PDT 2014