Bringing master into the JSValidation branch