Pull Requests

Merged a year ago. Opened a year ago by mspacek.