Merge pull request #1027 from marcosgdf/develop

CR fix
This commit is contained in:
Laurent Destailleur 2013-06-08 11:01:07 -07:00
commit c8a634fa08