Devel - Master merge 20141113