1.6 update

Signed-off-by: tachyony <tachyony@live.co.uk>