Several bug fixes
Merge remote-tracking branch 'upstream/master'
Update image version number
Remove hardcoded image version number from shell scripts