Commit 0fef38999abc74b8237971f96295f461631d9d1d

Carlos Martín Nieto 2014-09-16T01:25:53

Merge remote-tracking branch 'upstream/master' into cmn/host-cert-info