Merged pull request from plenske/master.