0314.2
Merge remote-tracking branch 'origin/develop' into feature/test_reabase

* origin/develop:
  0314.1
Merge pull request #2 from wjp2013/feature/test_reabase

Feature/test reabase