* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b': resolved conflicts for merge of c1edfc2c to master