Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

This commit is contained in:
Robin Sommer 2014-07-23 17:00:37 -07:00
commit 58bd8bb737

@ -1 +1 @@
Subproject commit ba83f4adb4098367cc986d5a5d058623fe489cc2
Subproject commit 1efa4d10f943351efea96def68e598b053fd217a