merge: development

version: 2.6.1

Merge branch 'development'

version: 2.6.0.rc-1

Merge remote-tracking branch 'upstream/master'

version: 2.5.5.rc-5

version: 2.5.5.rc-4

version: 2.5.5.rc-3

version: 2.5.5.rc-2

version: 2.5.5.rc-1