IFCA/occi-os — pull request #1 by enolfc (2013-12-20 12:15:12+00:00)
Title: Stable/grizzly

Include latest fixes into stable/grizzly