Merge branch 'master' into fix_pixel_cast

This commit is contained in:
artemp 2015-06-12 13:01:14 +01:00
commit 74d6e7740d

@ -1 +1 @@
Subproject commit 8e70a97b35fdb687bbfe4027713e302b86e8420a
Subproject commit a8a922990aa671369fdce51fe4bfe5447cead4d4