CS
Merge remote-tracking branch 'origin/master'
Haiku port.
Merge pull request #200 from rgsilva/master

Haiku port
Merge remote-tracking branch 'upstream/master'