Merge branch 'release-2.3.0'
version bump
better gallery option type
moved the description text
update inline docs
Merge branch 'hotfix-2.3.1' into wip