Updates from CinC 2014
Merged