Applying patch from HaikuPorts - GCI Task

http://www.google-melange.com/gci/task/view/google/gci2014/5832887072980992