Merge remote-tracking branch 'origin/master' into issue-104-cannot-exec-setuids
authorJeff Quast <jquast@io.com>
Sat, 20 Dec 2014 01:55:11 +0000 (17:55 -0800)
committerJeff Quast <jquast@io.com>
Sat, 20 Dec 2014 01:55:11 +0000 (17:55 -0800)

Trivial merge