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