Merge remote-tracking branch 'official/develop' into develop
[akkoma] / priv / gettext /
2017-03-17 Roger BraunPhoenix skeleton