Merge branch 'fixes-t3home13' of git://github.com/kdambekalns/Plumber into kdambekalns-fixes-t3home13