Merge branch 'master' into spirit-x3

This commit is contained in:
artemp 2016-02-09 11:45:37 +01:00
commit 6f33b8a5f1

@ -1 +1 @@
Subproject commit 94bb5e0330c3d920c9aed609058d01116917c90c
Subproject commit a49ef259427514faa2cc21242ee840c0caa1e290