Merge branch 'develop' into 'patch-2'
[akkoma] / priv / gettext /
2017-03-17 Roger BraunPhoenix skeleton