Merge commit '2ede1b8a25d32e057bcb9d246a9fd855a09bfc7c'
authorsrs5694 <srs5694@users.sourceforge.net>
Mon, 3 Oct 2016 17:58:34 +0000 (13:58 -0400)
committersrs5694 <srs5694@users.sourceforge.net>
Mon, 3 Oct 2016 17:58:34 +0000 (13:58 -0400)

Trivial merge