merge 4/OCT '14 (2)