Bug 1094146
Merge pull request #8 from jhadvig/BZ_1094146

Bug 1094146