• Merge commit 'aff8048' into HEAD

    @SimonSapin
    SimonSapin committed Jun 3, 2014
    3e0e121