Sync'd branch releases/beta with upstream @ Mon Sep  8 15:22:52 PDT 2014