manual merge of 1e09a72

Merge commit '1e09a72'