Merge pull request #2725 from phomes/misc-cleanup
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 23 Feb 2016 19:58:01 +0000 (14:58 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 23 Feb 2016 19:58:01 +0000 (14:58 -0500)
Misc cleanup


Trivial merge