v0.14

  - fixed missing merge from 0.12