Sync'd branch integration/fx-team with upstream @ Sun Aug 31 22:36:32 PDT 2014