commit 17c41079b222830bffac432dd4e41c0ea5bd9c17 Merge: e66ae36 e3ae718 Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Thu Aug 28 17:39:43 2014 +1000 Merge branch 'f20' ---