Merged version 0.96p ( 2013.9.19  commit# 39ce80179f )