BS140915 bug 68
BS140915 bug 66
Merge remote-tracking branch 'mooc/bs135'
[15092014] - Thien commit...