Deduplicated bootstrap include
Merge branch 'rubenvereecken-master'