Merge pull request #1409 from JohnyMoSwag/master (closes #1404)