Sync'd branch releases/beta with upstream @ Mon Sep  8 10:06:37 PDT 2014