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