Squashed 'lipsum/' changes from 6b22a48..2b5cc8f

2b5cc8f Merge commit '0e1c3c45f169f8b1138c073475345cab34efc95e'
0e1c3c4 Squashed 'ocaml-re/' changes from 242ad7e..c5e2fa5

git-subtree-dir: lipsum
git-subtree-split: 2b5cc8f4011882ff3f6cb682c0e289fc67715951
Merge commit 'f66a371c125f636774391793b480249ca923b677'