20141027  - Fixed limit expiry issue - see bug list