[Upg] mockery 0.9 & phpunit 4.0.*
[Fix] merge conflict
Merge branch '1.1' into 1.2
Merge branch '1.2'