Merge branch 'ohcredentials'
Authored by: Jean-Francois Dockes 2018-05-03
Parent(s): [d8b623][fd0b15]
Child(ren): [5a02aa]