Merge proposals dependent on lp://staging/~rutsky/ubuntu/trusty/ninja-ide/fix-descr-formatting

1. Trusty (14.04)
2. fix-descr-formatting
3. Dependent merge proposals