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)
commit594e6a4916560c0cb34d6abb15a5ca04e72ca173
tree1a768c374d2800307d03832ad4b0b2b763a93d51
parentb4a34de7d87a4d136985075bb9dbac925228e2f1
parent23fbc853226c3d10163579ca206a3fe35061dacc
Merge pull request #2230 from MikePetullo/for-15.05

For 15.05: Cherry pick a number of updates from maintainer into 15.05