Merge branch 'develop' into issue/941
[akkoma] / test / fixtures / httpoison_mock / skruyb@mamot.fr.atom
2017-05-11 Roger BraunFix cws.