Merge pull request from rsteckler/develop