Merge remote-tracking branch 'origin/mdw/master.found-crybaby'