Prepare for RC 2.
Merge pull request #223 from frmwrk123/prepare/rc2

Prepare for RC 2.
Merge branch 'dev'