noting
Merge branch '2014_4_27'