Updating master with current development state.
merged
mentioned in commit da3f632e
mentioned in commit f510b1b3