Squashed 'simsala/' changes from 18a924d..98a6de7

98a6de7 Merge commit 'c7d29ad8a958c593bdf9c7ef945bca61dcefe4fb'
c7d29ad Squashed 'lib/Phapp/' changes from 0f5d560..94c4f44

git-subtree-dir: simsala
git-subtree-split: 98a6de796a675058d8a3e08223aa893c962f9738
Merge commit '196d03e7a491044c1c8c1f8bde01c2628878cec3'