Closes #315
Merge commit '5a41c17f7d3ac9ad0f1cb4991c85ac954857c825' into HEAD