Update to version 2.7

Reviewer: @aogilvie