Branch 22 10 2014

@nsahoo  @xshi