Sync'd branch releases/beta with upstream @ Mon Sep 15 12:58:29 PDT 2014