am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':