Merge release 0.7.1 to master