Merge branch 'hotfix/20140510-twicas'
ustream
Merge branch 'hotfix/20140510-ustream' into develop