Merge trophies into master #12

Merged
Darks merged 2 commits from trophies into master 2019-06-07 01:47:05 +02:00
No description provided.