Private ChiliProject fork. WARNING: issues/* branches are rebased arbitrarily.