Sync'd branch releases/beta with upstream @ Mon Sep 29 17:43:35 PDT 2014