Merge `next` branch (I)

Let's give a good test to these changes and review the commits. It looks we have enough for merge.

@gmarik @starcraftman @lucc :)