masaakiyoshida

| Q | A | ------------- | --- | Branch? | 2.6 for new features | Bug fix? | no | New feature? | yes | BC breaks? | no...

| Q | A | ------------- | --- | Branch? | master for new features | Bug fix? | no | New feature? | yes | BC breaks? | yes...