Checkout
icing
committed
on 17 Dec 15
fixes after review by CJ