Fix for issue #247
Merge branch 'develop' of github.com:pgRouting/pgrouting into develop