Allow datum index to be passed as a third parameter to the data labels format function
Fix conflict
Merge branch 'edcartre-master'