Merge commit 'c4ec302979b279d5304f63c4481b73fadd44edac'
Merge commit '555dd3f2e35923bdee8b8a787b132af208141227'

Conflicts:
	PROMOTE/lineartest/README.md
Updated with latest linear