Merge remote-tracking branch 'upstream/master' into ENdoSnipe_Issue184
Issue # 184 commit today.
Commited #184