Merged changes from master branch up to current state.