content

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
ready to pack 1.2.1

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
Merge branch 'hotfix/content'