Commit 6bc0b86101e1efa18eaa8d0c045d83982b89ec47

Martin Mitas 2017-07-18T18:50:07

Merge branch 'hash'