Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 18 11:28:47 PDT 2014