Update to current version.

Pull needed to update developer branch so that builds will compile.