Merge changes from senseidb:master