Initial empty repository
Merge commit '2a1da801b0e06f247ee7c0e3d0c9319eef754744' into HEAD
Update to ikai changes and add bugfixes

Pull in Ikai's branch, and add fixes for several smaller bugs and
new cling style.

Change-Id: Ibdf671f6e3703695f77c9c962838e1e50a571534
Merge commit 'c2f7305787e291bd065f699a303803da944d1865' into HEAD