Removing epoch as this is impossible to ever have a conflict.
Removing epoch as this is impossible to ever have a conflict.
Removing epoch as this is impossible to ever have a conflict.
Merge pull request #602 from adminempire/unstable

Removing epoch. Impossible to conflict