* Merge
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop