Merge back new material for v4.7.

This commit is contained in:
Rafael J. Wysocki 2016-05-06 22:05:16 +02:00
commit c8541203a6
6 changed files with 763 additions and 544 deletions