Devel - Master merge 20141218