Development to master merge.

I guess it's not used anywhere :)
Another good chance to learn how Lint tool works.