Merge a trivial fix across from HEAD. Not that this