Ian Wienand bfca36c772 Merge tag '1.25.2' into merge-branch ...

Release 1.25.2

Change-Id: I698bcf2e82117bd81649cd065a7af5cac85990c7

2017-02-02 11:20:00 +11:00

..

dib-lint

Merge tag '1.25.2' into merge-branch

2017-02-02 11:20:00 +11:00