Created by: madppiper
@vdavid third time's a charm?
I ended up redoing the merge - manually updated conflicts. I used your master branch, so at least you won't have to remerge your master branch after this...
None