• Merge remote-tracking branch 'upstream/master' into HEAD

    @Ms2ger
    Ms2ger committed May 9, 2014
    f09d586