Merge pull request #2230 from MikePetullo/for-15.05
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 9 Jan 2016 15:06:44 +0000 (17:06 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Sat, 9 Jan 2016 15:06:44 +0000 (17:06 +0200)
For 15.05: Cherry pick a number of updates from maintainer into 15.05


Trivial merge