tworaz Merge branch '0.5.x'
78cebbf Sep 29, 2015
Merge branch '0.5.x'
78cebbf