Backport #1969 - Closes #2304 #2306

Closed
wants to merge 1 commit into
from
Commits on Jul 27, 2011