merging PR rtbkit_upstream_2014-09-10