Merge pull request #96 from daniellemayne/develop

Develop bugzid 3947: reuse of valid authentication tokens
Merge remote-tracking branch 'upstream/develop' into develop