Revision 3f127c04a459237857916b9b0af5f013c42a6126

Committed on 20/12/2018 11:25 pm by Nattfarinn <nattfarinn@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'origin/2.3'