Merge conflicts release

@lduarte1991, there were merge conflicts merging release into master. Does this look ok?