Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop
authormasensio <masensio@solidgear.es>
Mon, 31 Mar 2014 07:46:05 +0000 (09:46 +0200)
committermasensio <masensio@solidgear.es>
Mon, 31 Mar 2014 07:46:05 +0000 (09:46 +0200)

Trivial merge