@jbau -- indeed I have pulled @dcadams migration now, so can you merge from master and then redo yours as 0010 now.  Sorry about that.