Merge branch 'dev': tweaks for imminent GsDevKit release