gearing up for print again after fixes to InputItem et al
Merge branch 'master' into print