Fixed merge gone wrong (conflict-resolution accidentally not-committed), merged from issue-41. Fixes build.