Changes for 0.2.16 into master