diff --git a/frappe/__init__.py b/frappe/__init__.py
index 3aadfd418e..e068c23b97 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '7.1.7'
+__version__ = '7.1.8'
 __title__ = "Frappe Framework"
 
 local = Local()
diff --git a/frappe/public/js/frappe/ui/editor.html b/frappe/public/js/frappe/ui/editor.html
index f3c7becfca..3613a6976e 100644
--- a/frappe/public/js/frappe/ui/editor.html
+++ b/frappe/public/js/frappe/ui/editor.html
@@ -57,6 +57,9 @@
             <a class="btn btn-default btn-small" data-edit="justifycenter"
                 title="{{ __("Center (Ctrl/Cmd+E)") }}">
 				<i class="icon-align-center"></i></a>
+            <a class="btn btn-default btn-small" data-edit="justifyright"
+                title="{{ __("Align Right (Ctrl/Cmd+R)") }}">
+                <i class="icon-align-right"></i></a>
 			<a class="btn btn-default btn-small" data-edit="outdent"
                 title="{{ __("Reduce indent (Shift+Tab)") }}">
 				<i class="icon-indent-left"></i></a>