Update to 4.6
PR: 208980 Submitted by: Joe Barbish <qjail1@a1poweruser.com> Sponsored by: Essen Linuxhotel Hackathon 2016