0.16 merge

@basepi, the big one will come latter.