Fixed another build conflict.
Merge pull request #4 from gonzalezb/development-4.4.4

Fixed another build conflict.