Tagged trunk before merging in release 0.5 branch