Updated
Merge branch 'pull_drogar_20130817091905352'