johnynek Merge pull request #1871 from jimmycasey/develop …