x-legend
Merge branch 'hotfix/20141216-xlegend'