Upgrade solution.
Merge branch 'master' into styling