Merge bumblebee (3.2.1-14) import into refs/heads/workingbranch
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jan 2017 14:20:27 +0000 (14:20 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jan 2017 14:20:27 +0000 (14:20 +0000)

Trivial merge