Clone of crosbymichael/skydock branch : no-expire, commit : 8d0f94b8df