Migration to go with commit 87bf379a96db981ad6400a53a0d7978faf2fac49
Merge branch 'master' into issue-60