Merge branch 'master' into find

This commit is contained in:
Cvetomir Denchev
2016-01-02 17:51:03 +02:00