Resolved conflicts
Merge origin/master