commit c3caede7606d3afd727e190a90771f40af6c5e71
Merge: 50b24b9 da7d49e
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Sat Jun 20 18:29:33 2015 +0200

    Merge branch 'feature/c36555-bootstrap3' into development (closes: #c36555)