Merged fix for 1528014 from Jordy Provost

This commit is contained in:
bryce 2016-06-09 18:41:41 -07:00
commit a45715dde1