Merge branch 'release/v1.0.2'
Merge tag 'v1.0.2' into develop

Release v1.0.2 for use with Docker v1.1.2