Merge remote-tracking branch 'clement/protocol' into atp

This commit is contained in:
Stephen Birarda 2015-07-08 19:12:33 -07:00
commit 1f689c8fe6