# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1431108674 14400
# Node ID 15c313b6056709b82ab11d80de3f02b89a268577
# Parent  fd3461f865826f682202fe199715bd343266630a# Parent  82803ec84c826c0ab155ec7f3283e37fd5e2551b
Merge stable back into default.