Bring updated OwlDoc over from develop branch