third merge 2014 12 13
Merge branch 'ty2'