Fixing crash with 2015 plan year.
Merge branch 'release-1.1' into development