commit 80a77922c3c0ecf9efa062a2f8a2f50b7dfe9335
Merge: 8314996 58f5e4b
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Sat Nov 1 21:37:53 2014 +0100

    Merge branch 'feature/e1ac56-yard-documentation' into development (closes: #e1ac56)