Resolved conflicts in merge with branch master.