Rebase 1.6.1

I just rebase to the last opinkerfi master (1.6.1)