fix
Merge branch 'master' into 20141126