Merge branch 'master' into deriolabs
Dropped in koolback mockup.