Merged Adester-master.
Fixed merge conflicts.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>