  * Merge 0.9.3 code
  * Make the Windows build build

