Blender Git Loki

Merge with trunk: 30741-30831
Mistakenly forgot to commit the merge before adding the following feature:
== Wrap Texture Mode ==
Texture map coordinates are local to the brush instead of projected from the screen.