Merge pull request #318 from hnyman/luci-0.12