Merge 20141010

Merge with trunk e Fix