Merge "Fixed corrupt image download via proxy server" into devel/master