#271 Fix. Removed all branches from the fork, and trying now to commit the fix again in a clean branch
Merge pull request #276 from ddragosd/1.3-RC3

#271 Commiting the fix from a clean branch