repo for my hex addons :3

Resolve conflicts between 166, 191 master

Change-Id: I2036ceeca7a916d8ca11da2380e4d0246a6a6964


Author poolcritter Date Commit 26ff4526 Parent a1b238cb Change ID xzwtnlln