Merged SqlitePCLRawStorageEngine changes in master.