• Merge remote-tracking branch 'upstream/dev'. Fix #138

    @SimonSapin
    SimonSapin committed Jun 15, 2015
    7a90603