update to 1.1.5 of datastore
Merge branch '2.1.x' into 2.2.x