Rebase on current master

Authored by dvratil on Dec 11 2017, 3:58 PM.