Sync'd branch integration/fx-team with upstream @ Sun Sep 14 17:24:36 PDT 2014