Merge branch 'zealot'