Merge branch 'hotfix/2013-11.0.1'
Fixed missing endpoint for image streams URIs
Merge branch 'hotfix/2013-11.0.2' into develop