Fix typo on quick-start
Merge branches 'stable_colivre' and 'stable' into stable