Proper fix
Merge remote-tracking branch 'origin/v2-documentation' into gh-pages