Updated to 0.9.14
Merge remote-tracking branch 'upstream/master'