Merge branch 'hotfix/20141212-block01'
x-legend
Merge branch 'hotfix/20141216-xlegend' into develop