Avoid React warnings regarding the 'key' property
Merge remote-tracking branch 'origin/master'