Merge branch 'master' into marty
Merge branch 'master' into marty
Fixed shingle image duplication issue
Merge branch 'marty'