Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
a shim for the some assets not having the lifecycle attach properly
Merge pull request #61 from splinter/master

A shim to handle assets without a lifecycle state