upstream/0.8.0+git20140910
03ce659d · Merge pull request #591 from koeppea/fix-588 ·