Merge conflicts
Merge branch 'PeercoinArmory-0.5.0-dev'