diff --git a/.gitignore b/.gitignore
index a2b2a70772..69182e5539 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,174 +1,175 @@
 # Common
 \#*
 .\#*
 GPATH
 GRTAGS
 GTAGS
 TAGS
 Makefile
 Makefile.in
 .deps
 .libs
 *.pc
 *.pyc
 *.bz2
 *.tar.gz
 *.rpm
 *.la
 *.lo
 *.o
 *~
 *.gcda
 *.gcno
 
 
 # Autobuild
 aclocal.m4
 autoconf
 autoheader
 autom4te.cache/
 automake
 build.counter
 compile
 config.guess
 config.log
 config.status
 config.sub
 configure
 depcomp
 install-sh
 include/stamp-*
 libltdl.tar
 libtool
 libtool.m4
 ltdl.m4
 ltmain.sh
 missing
 py-compile
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 test-driver
 ylwrap
 
 # Configure targets
 Doxyfile
 coverage.sh
 cts/CTSvars.py
 cts/HBDummy
 cts/LSBDummy
 cts/benchmark/clubench
 cts/lxc_autogen.sh
 extra/logrotate/pacemaker
 include/config.h
 include/config.h.in
 include/crm_config.h
 lrmd/pacemaker_remote
 lrmd/pacemaker_remoted
 lrmd/pacemaker_remote.service
 mcp/pacemaker
 mcp/pacemaker.combined.upstart
 mcp/pacemaker.service
 mcp/pacemaker.upstart
 pengine/regression.core.sh
 publican.cfg
 shell/modules/help.py
 shell/modules/ra.py
 shell/modules/ui.py
 shell/modules/vars.py
 tools/cibsecret
 tools/coverage.sh
 tools/crm_error
+tools/crm_mon.service
 tools/crm_mon.upstart
 tools/crm_report
 tools/report.common
 lrmd/regression.py
 fencing/regression.py
 
 # Build targets
 *.7
 *.7.xml
 *.7.html
 *.8
 *.8.xml
 *.8.html
 attrd/attrd
 doc/*/en-US/images/*.png
 doc/*/tmp/**
 doc/*/publish
 cib/cib
 cib/cibmon
 cib/cibpipe
 crmd/atest
 crmd/crmd
 doc/api/*
 doc/Clusters_from_Scratch.txt
 doc/Pacemaker_Explained.txt
 doc/acls.html
 doc/crm_fencing.html
 fencing/stonith-test
 fencing/stonith_admin
 fencing/stonithd
 fencing/stonithd.xml
 lrmd/lrmd
 lrmd/lrmd_internal_ctl
 lrmd/lrmd_test
 mcp/pacemakerd
 pengine/pengine
 pengine/pengine.xml
 pengine/ptest
 shell/regression/testcases/confbasic-xml.filter
 scratch
 tools/attrd_updater
 tools/cibadmin
 tools/crm_attribute
 tools/crm_diff
 tools/crm_mon
 tools/crm_node
 tools/crm_resource
 tools/crm_shadow
 tools/crm_simulate
 tools/crm_uuid
 tools/crm_verify
 tools/crmadmin
 tools/iso8601
 tools/crm_ticket
 tools/report.collector.1
 xml/crm.dtd
 xml/pacemaker*.rng
 xml/versions.rng
 extra/rgmanager/ccs2cib
 extra/rgmanager/ccs_flatten
 extra/rgmanager/disable_rgmanager
 doc/Clusters_from_Scratch.build
 doc/Clusters_from_Scratch/en-US/Ap-*.xml
 doc/Clusters_from_Scratch/en-US/Ch-*.xml
 doc/Pacemaker_Explained.build
 doc/Pacemaker_Explained/en-US/Ch-*.xml
 doc/Pacemaker_Explained/en-US/Ap-*.xml
 doc/Pacemaker_Remote.build
 doc/Pacemaker_Remote/en-US/Ch-*.xml
 lib/gnu/libgnu.a
 lib/gnu/stdalign.h
 *.coverity
 
 #Other 
 mock
 HTML
 pacemaker*.spec
 pengine/.regression.failed.diff
 coverity-*
 
 compat_reports
 .ABI-build
 abi_dumps
 logs
 
 *.patch
 *.diff
 *.sed
 *.orig
 *.rej
 *.swp
 pengine/test10/shadow.*
diff --git a/tools/crm_mon.service.in b/tools/crm_mon.service.in
index 3717824188..0c7e8f1cda 100644
--- a/tools/crm_mon.service.in
+++ b/tools/crm_mon.service.in
@@ -1,11 +1,15 @@
 [Unit]
 Description=Daemon for pacemaker monitor
 
 [Service]
 Type=forking
 EnvironmentFile=-@sysconfdir@/sysconfig/crm_mon
 ExecStart=@sbindir@/crm_mon $OPTIONS
 Restart=always
 
+# crm_perror() writes directly to stderr, so ignore it here to avoid
+# double-logging with the wrong format
+StandardError=null
+
 [Install]
 WantedBy=multi-user.target
diff --git a/xml/crm_mon.rng b/xml/crm_mon.rng
index 5f6dc7cd27..329b9b8908 100644
--- a/xml/crm_mon.rng
+++ b/xml/crm_mon.rng
@@ -1,182 +1,283 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
 
     <start>
         <ref name="element-crm_mon"/>
     </start>
 
     <define name="element-crm_mon">
         <element name="crm_mon">
             <attribute name="version"> <text/> </attribute>
             <element name="summary">
                 <optional>
                     <element name="last_update">
                         <!-- crm_mon shows dates like "Mon Apr 13 16:06:27 2015" not
                              the XSD dateTime like "2015-04-13T16:06:27-05:00" -->
                         <attribute name="time"> <text/> </attribute>
                     </element>
                 </optional>
                 <optional>
                     <element name="last_change">
                         <attribute name="time"> <text/> </attribute>
                         <attribute name="user"> <text/> </attribute>
                         <attribute name="client"> <text/> </attribute>
                         <attribute name="origin"> <text/> </attribute>
                     </element>
                 </optional>
                 <optional>
                     <element name="stack">
                         <attribute name="type"> <text/> </attribute>
                     </element>
                 </optional>
                 <element name="current_dc">
                     <attribute name="present"> <data type="boolean" /> </attribute>
                     <optional>
                         <group>
                             <attribute name="version"> <text/> </attribute>
                             <attribute name="name"> <text/> </attribute>
                             <!-- pacemaker IDs are user-defined strings that are
                                  not as restricted as the XSD ID type -->
                             <attribute name="id"> <text/> </attribute>
                             <attribute name="with_quorum"> <data type="boolean" /> </attribute>
                         </group>
                     </optional>
                 </element>
                 <element name="nodes_configured">
                     <attribute name="number"> <data type="int" /> </attribute>
                     <choice>
                         <attribute name="expected_votes"> <data type="int" /> </attribute>
                         <attribute name="expected_votes"> <value>unknown</value> </attribute>
                     </choice>
                 </element>
                 <element name="resources_configured">
                     <attribute name="number"> <data type="int" /> </attribute>
                 </element>
+                <optional>
+                    <element name="cluster_options">
+                        <attribute name="stonith-enabled"> <data type="boolean" /> </attribute>
+                        <attribute name="symmetric-cluster"> <data type="boolean" /> </attribute>
+                        <attribute name="no-quorum-policy"> <text/> </attribute>
+                    </element>
+                </optional>
             </element>
             <element name="nodes">
                 <zeroOrMore>
                     <element name="node">
                         <attribute name="name"> <text/> </attribute>
                         <attribute name="id"> <text/> </attribute>
                         <attribute name="online"> <data type="boolean" /> </attribute>
                         <attribute name="standby"> <data type="boolean" /> </attribute>
                         <attribute name="standby_onfail"> <data type="boolean" /> </attribute>
                         <attribute name="maintenance"> <data type="boolean" /> </attribute>
                         <attribute name="pending"> <data type="boolean" /> </attribute>
                         <attribute name="unclean"> <data type="boolean" /> </attribute>
                         <attribute name="shutdown"> <data type="boolean" /> </attribute>
                         <attribute name="expected_up"> <data type="boolean" /> </attribute>
                         <attribute name="is_dc"> <data type="boolean" /> </attribute>
                         <attribute name="resources_running"> <data type="int" /> </attribute>
                         <attribute name="type">
                             <choice>
                                 <value>unknown</value>
                                 <value>member</value>
                                 <value>remote</value>
                                 <value>ping</value>
                             </choice>
                         </attribute>
                         <optional>
-                            <!-- 1.1.13 adds container_id for virtualized pacemaker_remote nodes -->
-                            <attribute name="container_id"> <text/> </attribute>
+                            <!-- for virtualized pacemaker_remote nodes, crm_mon 1.1.13 uses
+                                 "container_id" while later versions use "id_as_resource" -->
+                            <choice>
+                                <attribute name="container_id"> <text/> </attribute>
+                                <attribute name="id_as_resource"> <text/> </attribute>
+                            </choice>
                         </optional>
                         <ref name="resource_list" />
                     </element>
                 </zeroOrMore>
             </element>
             <optional>
                 <element name="resources">
                     <ref name="resource_list" />
                 </element>
             </optional>
+            <optional>
+                <element name="node_attributes">
+                    <zeroOrMore>
+                        <element name="node">
+                            <attribute name="name"> <text/> </attribute>
+                            <zeroOrMore>
+                                <element name="attribute">
+                                    <attribute name="name"> <text/> </attribute>
+                                    <attribute name="value"> <text/> </attribute>
+                                    <optional>
+                                        <attribute name="expected"> <data type="int" /> </attribute>
+                                    </optional>
+                                </element>
+                            </zeroOrMore>
+                        </element>
+                    </zeroOrMore>
+                </element>
+            </optional>
+            <optional>
+                <element name="node_history">
+                    <zeroOrMore>
+                        <element name="node">
+                            <attribute name="name"> <text/> </attribute>
+                            <zeroOrMore>
+                                <element name="resource_history">
+                                    <attribute name="id"> <text/> </attribute>
+                                    <attribute name="orphan"> <data type="boolean" /> </attribute>
+                                    <attribute name="migration-threshold"> <data type="int" /> </attribute>
+                                    <optional>
+                                        <attribute name="fail-count"> <data type="int" /> </attribute>
+                                    </optional>
+                                    <optional>
+                                        <attribute name="last-failure"> <text/> </attribute>
+                                    </optional>
+                                    <zeroOrMore>
+                                        <element name="operation_history">
+                                            <attribute name="call"> <text/> </attribute>
+                                            <attribute name="task"> <text/> </attribute>
+                                            <optional>
+                                                <attribute name="interval"> <text/> </attribute>
+                                            </optional>
+                                            <optional>
+                                                <attribute name="last-rc-change"> <text/> </attribute>
+                                            </optional>
+                                            <optional>
+                                                <attribute name="last-run"> <text/> </attribute>
+                                            </optional>
+                                            <optional>
+                                                <attribute name="exec-time"> <text/> </attribute>
+                                            </optional>
+                                            <optional>
+                                                <attribute name="queue-time"> <text/> </attribute>
+                                            </optional>
+                                            <attribute name="rc"> <data type="int" /> </attribute>
+                                            <attribute name="rc_text"> <text/> </attribute>
+                                        </element>
+                                    </zeroOrMore>
+                                </element>
+                            </zeroOrMore>
+                        </element>
+                    </zeroOrMore>
+                </element>
+            </optional>
             <optional>
                 <element name="failures">
                     <zeroOrMore>
                         <element name="failure">
                             <choice>
                                 <attribute name="op_key"> <text/> </attribute>
                                 <attribute name="id"> <text/> </attribute>
                             </choice>
                             <attribute name="node"> <text/> </attribute>
                             <attribute name="exitstatus"> <text/> </attribute>
                             <attribute name="exitreason"> <text/> </attribute>
                             <attribute name="exitcode"> <data type="int" /> </attribute>
                             <attribute name="call"> <text/> </attribute>
                             <attribute name="status"> <text/> </attribute>
                             <optional>
                                 <group>
                                     <attribute name="last-rc-change"> <text/> </attribute>
                                     <attribute name="queued"> <text/> </attribute>
                                     <attribute name="exec"> <text/> </attribute>
                                     <attribute name="interval"> <data type="int" />  </attribute>
                                     <attribute name="task"> <text/> </attribute>
                                 </group>
                             </optional>
                         </element>
                     </zeroOrMore>
                 </element>
             </optional>
+            <optional>
+                <element name="tickets">
+                    <zeroOrMore>
+                        <element name="ticket">
+                            <attribute name="id"> <text/> </attribute>
+                            <attribute name="status"> <text/> </attribute>
+                            <attribute name="standby"> <data type="boolean" /> </attribute>
+                            <optional>
+                                <attribute name="last-granted"> <text/> </attribute>
+                            </optional>
+                        </element>
+                    </zeroOrMore>
+                </element>
+            </optional>
+            <optional>
+                <element name="bans">
+                    <zeroOrMore>
+                        <element name="ban">
+                            <attribute name="id"> <text/> </attribute>
+                            <attribute name="resource"> <text/> </attribute>
+                            <attribute name="node"> <text/> </attribute>
+                            <attribute name="weight"> <data type="int" />  </attribute>
+                            <attribute name="master_only"> <data type="boolean" /> </attribute>
+                        </element>
+                    </zeroOrMore>
+                </element>
+            </optional>
         </element>
     </define>
 
     <define name="resource_list">
         <interleave>
             <zeroOrMore>
                 <ref name="element-resource" />
             </zeroOrMore>
             <zeroOrMore>
                 <ref name="element-group" />
             </zeroOrMore>
             <zeroOrMore>
                 <ref name="element-clone" />
             </zeroOrMore>
         </interleave>
     </define>
 
     <define name="element-resource">
         <element name="resource">
             <attribute name="id"> <text/> </attribute>
             <attribute name="resource_agent"> <text/> </attribute>
             <attribute name="role"> <text/> </attribute>
             <attribute name="active"> <data type="boolean" /> </attribute>
             <attribute name="orphaned"> <data type="boolean" /> </attribute>
             <attribute name="managed"> <data type="boolean" /> </attribute>
             <attribute name="failed"> <data type="boolean" /> </attribute>
             <attribute name="failure_ignored"> <data type="boolean" /> </attribute>
             <attribute name="nodes_running_on"> <data type="int" />  </attribute>
             <optional>
                 <attribute name="pending"> <text/> </attribute>
             </optional>
             <optional>
                 <!-- crm_mon prints the node only if group-by-node is false -->
                 <element name="node">
                     <attribute name="name"> <text/> </attribute>
                     <attribute name="id"> <text/> </attribute>
                     <attribute name="cached"> <data type="boolean" /> </attribute>
                 </element>
             </optional>
         </element>
     </define>
 
     <define name="element-group">
         <element name="group">
             <attribute name="id"> <text/> </attribute>
             <attribute name="number_resources"> <data type="int" /> </attribute>
             <ref name="resource_list" />
         </element>
     </define>
 
     <define name="element-clone">
         <element name="clone">
             <attribute name="id"> <text/> </attribute>
             <attribute name="multi_state"> <data type="boolean" /> </attribute>
             <attribute name="unique"> <data type="boolean" /> </attribute>
             <attribute name="managed"> <data type="boolean" /> </attribute>
             <attribute name="failed"> <data type="boolean" /> </attribute>
             <attribute name="failure_ignored"> <data type="boolean" /> </attribute>
             <ref name="resource_list" />
         </element>
     </define>
 
 </grammar>