Re: Updating for GCC 6