Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 08:21:38 PDT 2014