20141109 - Fixed limit expiry issue - see bug list