20141119 - Fixed limit expiry issue - see bug list