Merge branch 'kmscube'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 18 Nov 2015 20:50:40 +0000 (22:50 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 18 Nov 2015 20:50:40 +0000 (22:50 +0200)

Trivial merge