Merge pull request #2753 from phomes/trivial-fixes2
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 29 Feb 2016 00:12:31 +0000 (19:12 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 29 Feb 2016 00:12:31 +0000 (19:12 -0500)
Trivial fixes


Trivial merge