Merge request for lk/master 

Hi, Travis 

Here is some random stuff we have internally that I think can be merged into lk/master. Please take a look.

Mikhail.