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