Merge pull request #253 from hnyman/luci-0.12