Revision a958391843b0ca7980f3bb7a0dd3a8b65c3de29d

Committed on 07/12/2017 12:55 am by Luca Realdi <lr@opencontent.it> [GitHub Diff]

Merge commit 'bcae642b8359a40c5025b1abb2d9c69aeb521f7f'

# Conflicts:
# classes/objectalbotelematicohelper.php