tree 54b90b8e2f18e6ffd0da9ee6292e0e18f5246682
parent 5ebfda6021d30ecab152d88633252b3735698487
parent ea382942ac333d159019bf77571f82c5f112641c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1438710611 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1438710699 -0700

Merge feature branch 'feature-cert'

Change-Id: If708ba37e79d6c9c8e13941ce89be97a7f45b3cb
Refs: #2861, #2868, #3058