Merge branch 'release-0.5' into develop

This commit is contained in:
MassimilianoPinto 2014-03-28 17:14:20 +01:00
commit 4408d7095a