Sync'd branch releases/aurora with upstream @ Mon Sep 29 06:48:54 PDT 2014