bugfix: need to escape `$` in Makefiles
don't print runtime paths when running from Travis
restore end-of-patch marker for later automatic fetching of differences
Merge branch 'bugfixes' into develop