Merge pull request #1825 from gd-merge/release-to-develop

Merge gd-merge:release-to-develop into develop

Reviewed-by: Dan Homola
             https://github.com/no23reason

Author: gdgate