Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 11:03:43 PDT 2014