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