dev/v2 #8

Closed
maieul wants to merge 0 commits from dev/v2 into master