Fixed buildpack problem
Merge remote-tracking branch 'origin/kratos' into kratos