tweaking some language to describe our support more precisely
Merge remote-tracking branch 'origin/develop' into develop