Merge branch 'fperrad-20151231_indent'