applied the changes that occured on master since. (to simplify merge to come)
applied the changes that occured on master since. (to simplify merge to come)

AdrieanKhisbe/resty,AdrieanKhisbe/resty,micha/resty,AdrieanKhisbe/resty,micha/resty,AdrieanKhisbe/resty,micha/resty,micha/resty,AdrieanKhisbe/resty,micha/resty