Fix for Vanilla-238.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>
Merge pull request #472 from greatman/master

Fix for Vanilla 238.