merge: merge back stable into default

This commit is contained in:
Marcin Kuzminski 2016-05-25 14:16:46 +02:00
commit fe91487ee5

Diff content is not available