Sync'd branch releases/aurora with upstream @ Mon Sep 15 14:26:30 PDT 2014