Manual merge of 2014-06-26 18:42 UTC+0200 Przemyslaw Czerpak
https://github.com/harbour/core/commit/97a23295d548d74579bef6ee84f265bb790dd2bc