commit 52b65ea6e0c249fab3e2c368abe4239b26dd6fae
Merge: 4239162 b12d78b
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Sat Oct 25 21:56:20 2014 +0200

    Merge branch 'feature/9f7883-rounding-to-time-resolution' into development (closes: #9f7883)