Merge pull request #1646 from marcosgdf/develop

CR Fix
This commit is contained in:
Juanjo Menent 2014-06-09 16:18:25 +02:00
commit 8ae2dfbf9e