Merge branch 'devel_0.13.x' into 'master'
0.13.1 into master See merge request NCER-PD/scheduling-system!221
Gitlab will go in to maintenance on Friday 5:30pm since SIU is doing Isilon maintenance and we use isilon shares on the Gitlab
0.13.1 into master See merge request NCER-PD/scheduling-system!221