Backport fix for BZ #18928?

[Carlos O'Donell]

On 12/17/2015 12:15 PM, Tulio Magno Quites Machado Filho wrote:
>> We bump the subversion to 2 to give a demarcation point where the feature changed
>> in an important backwards-incompatible way.
> 
> Could we do that for all the other stable branches as well?

I withdraw my suggestions.

All you need to do is:

- Cherry pick the commit.
- Add your bugs to the NEWS file.
- Adjust Changlog.
- Commit.

Please do not adjust VERSION.

Any commits on master are OK for stable branches as long as they
do not break ABI/API or backwards compatibility, and please use
your best judgement and ask if you think there might be problems
(like in this case).

Cheers,
Carlos.