ticket:1 merge minor changes from master to t1_nethen
Merge branch 't1_nethen' of https://github.com/mrnethen/CupsTask into t1_nethen