Please take r279008 for the release

[Hans Wennborg via cfe-commits]

On Wed, Aug 17, 2016 at 5:27 PM, Marshall Clow <mclow.lists at gmail.com> wrote:
> Unlike the #278904, this does fix a bug - and a non-trivial one at that.

Thanks! I've merged it in r279017.