Changes between #286 and #287

No changes in any of the builds.