syncing 1.0.2-dev with master!

We appear to be very close to having 1.0.2 ready to roll out the door.  Syncing the 1.0.2 branch with master, in preparation of tagging the 1.0.2 release soon