upstream/20151118
a06efe50 · Merge pull request #14 from reinerh/master · Nov 18, 2015