update from origin master

Ready for 0.8.3