Merge commit '6477a5837668cd26fa32ec4c9fc7fcb0df0dc25e'
Merge pull request #122 from chrisshayan/Release13

Release13
Merge commit 'edccbe63bdd05464b0964c5443db096e2877e6a5'
Merge commit 'd207f16e973989c2e2b1f262add8e46a5422eac6'
Merge commit '15faab6e5061322f88f7fa5c4537b02611c0bab4'
Merge commit 'cf76db4c64e75630cf26199005a765ef04968b85'
Refactor security config