Merged pull requests from ethervoid.