Merge branch 'devel-stable' into misc

This commit is contained in:
Russell King 2017-02-28 11:05:54 +00:00
commit 399f157afd
51 changed files with 569 additions and 337 deletions