Merge branch 'develop', remote branch 'upstream/develop' into develop
heart support
Merge pull request #1 from vladimirk/develop

heart support