Rebase back to V1.0
Merge origin/master