0.1.7 core
Merge remote-tracking branch 'origin/master'