Commit 762b23281d51622fc65486521bf984b5ff146b78

Werner Lemberg 2015-12-20T06:39:38

Minor clean-ups.