CA: 2015-2016 flipover.
Merge branch 'paultag/new-session/ca'