port to 0.6 - closes #499
port to 0.6 - close #480