Merge Basic short description for dwarves into Master