Merge tag '20141118074609' into develop

milestone: 20141118074609 20141118074609
pycharm
Merge branch 'release/20141118083221'