fix on release candidate
Merge branch 'release/rc-1.0.1_20140205' into develop