Merge branch 'bug_9039' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-11-12 20:06:31 -05:00
commit 3b8a750ee2