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