Updated from 0.6.4-8-g88c6b6e