Merge branch 'release/20140301'
Merge tag '20140301' into develop

bugfixes and sort mode