Merge branch 'landsat' into develop
Merge branch 'develop' into landsat