Merge branch 'thingos' into dev

This commit is contained in:
Calin Crisan 2017-05-07 21:07:27 +03:00
commit f9ec89e384