Merge pull request #812 from thingthing/3.2-I3911

3.2 i3911 (closes #3911, closes #3912)