test case for bug report #161
Merge branch 'master' into live_features
Mappings for Welsh
update settings
Merge pull request #170 from jimkont/live_features

live_features