resync master with 0.6