Sync'd branch integration/fx-team with upstream @ Sun Sep 14 08:18:40 PDT 2014