Merge pull request #1611 from gilmoskowitz/issue23976
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 23 Jun 2014 20:42:06 +0000 (16:42 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 23 Jun 2014 20:42:06 +0000 (16:42 -0400)
issue #23976 and issue #23937


Trivial merge