Merges changes from master.
Quick commit without comment.