Merge conflict resolution. Sitrus2015 branch

Merge conflict resolution. Sitrus2015 branch.

@Benglin, please, take a look.