Revision 320fdbd617141a87d1c413c4f61a0870a23e151a

Committed on 22/03/2017 7:07 am by Lukasz Serwatka <l.serwatka@gazeta.pl> [GitHub Diff]

Merge remote-tracking branch 'upstream/master'

# Conflicts:
# README.md
# composer.json