[wiki] [sites] Merge remote-tracking branch 'origin/master' || Philippe Gras

[git]

commit 38fdd48a0d254359e594a99ecc6990f801b065c4
Merge: 0ee04ab 1adeafa
Author: Philippe Gras <philippe.g...@free.fr>
Date:   Sun Mar 6 00:11:41 2016 +0100

    Merge remote-tracking branch 'origin/master'