Merge branch 'hotfix/20141216-tv'
check
Merge branch 'hotfix/20141216-tv2' into develop