fixing merge
Merge remote-tracking branch 'origin/documentation' into gh-pages