Merge branch 'develop' into 'mastopost'
authorlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)
# Conflicts:
#   .gitignore


Trivial merge