Revision bccbc9e28e23f1b2bedf9289238e1962af3595e4

Committed on 03/03/2016 6:02 am by André R <ar@ez.no> [GitHub Diff]

Merge tag 'v1.2.0' and adjust for dev-master

Conflicts:
composer.json