ij
Merge branch 'master' of https://github.com/vangoghjoe/CN_Conv
run-set-status-to-manually-cleared