ci_hudson Merge branch 'develop'

Latest commit bdb6be6

Mar 14, 2016