Merge branch 'master' into specfiles

This commit is contained in:
Alhadis
2016-09-09 05:07:55 +10:00
14 changed files with 694 additions and 14 deletions