Update to 20160421
PR: 208984 Submitted by: Nikolai Lifanov <lifanov@mail.lifanov.com> (maintainer) Sponsored by: Essen Linuxhotel Hackathon 2016