Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 11:53:45 PDT 2014