Merge branch 'cleanups-4.7' into for-chris-4.7-20160516

This commit is contained in:
David Sterba 2016-05-16 15:46:24 +02:00
commit 5ef64a3e75
15 changed files with 176 additions and 190 deletions