Merge pull request #1373 from stevewithington/develop

bug fix: issue #1371
Merge pull request #1374 from stevewithington/develop

bug fix: issue #1370 caused by pull request #1316