Merging in the master from birryree