Merge commit 'cd67d7'

Artificial merge point for combining https://github.com/PBSA/peerplays/ with PBSA bitbucket.
This commit is contained in:
Peter Conrad 2018-09-03 17:14:28 +02:00
commit 53a306fd0f