The following commit has been merged in the merge/master branch: commit 16d21dc13ee849267206e37c39df14977d476254 Merge: bea6f41c8e09e02d5a3bc78200bd3e9c11a287b4 958aafba93c7e408237298c5b2c5d7c3e318402c Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat Aug 8 00:48:30 2015 +0800

Merge branch 'maint' into next