Commit ab8a0fdb31ff7e944d01348f28a2da19e50f8839

Edward Thomson 2017-01-06T17:10:49

Merge branch '25_certcheckcb' into maint/v0.25