Brings changes in upstream master to the dev branch
Brings changes in upstream master to the dev branch

selvinortiz/craft.doxter,selvinortiz/craft.doxter,selvinortiz/craft.doxter,selvinortiz/craft.doxter