Fixed merge conflicts from January commits.
Merge branch 'huertanix-master'