Merge branch 'k.o/for-4.6-rc' into testing/4.6

This commit is contained in:
Doug Ledford 2016-04-28 15:16:32 -04:00
commit e29bff46b9
21 changed files with 171 additions and 98 deletions