Sync'd branch integration/fx-team with upstream @ Tue Sep 30 06:40:35 PDT 2014