Fixes #4018 #4964

Merged
merged 1 commit into from Oct 19, 2016
Merged

Fixes #4018 #4964

merged 1 commit into from Oct 19, 2016