Drop this todo. it's supported
rebased onto 53a110bf9efefac478b87d4275762f994b688c20
Done.
Pull-Request has been merged by asahilina