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