Merge conflicts
Authored by: Miguel Rodrigues 2018-05-12
Parent(s): [851bc5][c6d71f]
Child(ren): [a58bf5]