merged to master v1.8.1.1

- careful merge of v1.8.1.1 master
- reformatted source
- pending: test for side-effects of new tabs behavior
- pending: encounter a few crashes, need time to investigate.