v0.2.6+0beb946fe878b0137e2825b6b97857e1d5c00712
Merge branch 'develop'

Conflicts:
	.semver