Remove special cases from layout.gap()
Merge branch 'master' of github.com:garious/yoink