Merge branch 'master' into release/3.1
authorJames Almer <jamrial@gmail.com>
Sun, 26 Jun 2016 18:14:17 +0000 (15:14 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 26 Jun 2016 18:14:17 +0000 (15:14 -0300)
Merged-by: James Almer <jamrial@gmail.com>

Trivial merge