Resolved conflicts
Resolved conflicts
Merge origin/master