Skip to content

Fixes #3801.#3816

Merged
dfreedm merged 2 commits intomasterfrom fix-3801Jul 27, 2016