Merge master -> dev for 0.8.7.1 release