Upstream merge

Fork version upgraded to 0.6.6