Merge remote-tracking branch 'upstream/master' into bwm-ng 1421/head
authorJulen Landa Alustiza <julen@zokormazo.info>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)
committerJulen Landa Alustiza <julen@zokormazo.info>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)

Trivial merge