Merge branch 'master' of github.com:UnityTech/UIWidgets into dev

# Conflicts:
#	Runtime/ui/painting/picture.cs

Runtime/ui/painting/picture.cs

                     //check for underflow
                     if (this._states.Count > 1) {
                         this.restore();
-                        this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
+                    this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
                     break;
                 }