2014-11-23  ovolkov  <ovolkov>

[2ee598800f69] [v3]
* merge with default


