Commit 211e117a0590583a720c53172406f34186c543bd

Carlos Martín Nieto 2016-04-12T00:18:17

Merge pull request #3739 from ethomson/0.24.1 Backport bug fixes to 0.24