Merge branch 'master' into ipc-doc-effort

This commit is contained in:
NikVolf 2016-04-12 15:16:05 +03:00
commit 5a5f13205e