Third round (week) of dev->master#9

ssuchter wants to merge 4 commits into

masterssuchter/test:masterfrom

devssuchter/test:devCopy head branch name to clipboard