Merge remote-tracking branch 'Pantastic/master' into Pantastic-proto

* Pantastic/master: