Merge branch 'Single-Checkout'
Merge branch 'gh-pages'
fixes links state
Merge branch 'master' into gh-pages