upgrade to blackfriday v2#7

cobber wants to merge 7 commits intothejerf:masterthejerf/markdir:masterfrom

cobber:mastercobber/markdir:masterCopy head branch name to clipboard