Resolve merge conflicts from #68
Resolve merge conflicts from #68

quickliketurtle/jigsaw,tightenco/jigsaw,quickliketurtle/jigsaw,quickliketurtle/jigsaw,tightenco/jigsaw,adamwathan/jigsaw,adamwathan/jigsaw,tightenco/jigsaw