Updated for 1.13
Updated for 1.13

Also manually merged in the 1.12 update from the 1.12 release branch

BrightstarDB/BrightstarDB,BrightstarDB/BrightstarDB,BrightstarDB/BrightstarDB,BrightstarDB/BrightstarDB