v1.0.2 merge to master

@AndyMenzies can you agree the merge please, only change since bugfix merge is change to version number and autogenerated files.