Merge branch 'propmangle'
authorMihai Bazon <mihai.bazon@gmail.com>
Sun, 29 Mar 2015 09:50:43 +0000 (12:50 +0300)
committerMihai Bazon <mihai.bazon@gmail.com>
Sun, 29 Mar 2015 09:50:43 +0000 (12:50 +0300)

Trivial merge