don't seed with time, be deterministic across runs
Merge remote branch 'cci/master'