Changes since tag 3.50

commit ed0208d806665c5c14cf4f759ee99dc8ce061ba8
Author: Azilroka <darktemplar9900@yahoo.com>
Date:   Thu Aug 24 15:57:02 2017 -0500

    Remove.. Conflicts.

