Merge branch 'tx53-update-2016-02-03' into karo-tx6