commit before merge w/ chicamocha
merged with chicamocha, hopefully
merging carreau with burgers/master