# HG changeset patch
# User Kevin Bullock <kbullock+mercurial@ringworld.org>
# Date 1509574785 18000
# Node ID 3ce0e4b51f789eff195ec900a07c1fa5e8d5c5f2
# Parent  907ff34e1460e2ced2aac24e728c242033394c23# Parent  95f54cec00258ffa4caa8df38e4ecb265aa7a0a3
merge stable into default